diff --git a/Examples/test-suite/python/kwargs.i b/Examples/test-suite/python/kwargs.i
index 21f6ea8b1..94678206d 100644
--- a/Examples/test-suite/python/kwargs.i
+++ b/Examples/test-suite/python/kwargs.i
@@ -106,4 +106,6 @@
 
   int foo_nu(int from = 1, int = 0) {return from; }
 
+  int foo_mm(int min = 1, int max = 2) {return min + max; }
+
 %}
diff --git a/Examples/test-suite/python/kwargs_runme.py b/Examples/test-suite/python/kwargs_runme.py
index 9546730f7..91812929d 100644
--- a/Examples/test-suite/python/kwargs_runme.py
+++ b/Examples/test-suite/python/kwargs_runme.py
@@ -58,3 +58,10 @@ if foo_kw(_from=2) != 4:
 
 if foo_nu(_from=2, arg2=3) != 2:
   raise RuntimeError
+
+if foo_mm(min=2) != 4:
+  raise RuntimeError
+
+if foo_mm(max=3) != 4:
+  raise RuntimeError
+  
diff --git a/Lib/swigwarnings.swg b/Lib/swigwarnings.swg
index d3d1065e9..803207257 100644
--- a/Lib/swigwarnings.swg
+++ b/Lib/swigwarnings.swg
@@ -113,7 +113,7 @@
  * ----------------------------------------------------------------------------- */
 
 #define %keywordwarn(msg...) %namewarn(%warningmsg(SWIGWARN_PARSE_KEYWORD, msg)) 
-#define %builtinwarn(msg...) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, msg))
+#define %builtinwarn(msg...) %namewarn(%warningmsg(SWIGWARN_PARSE_BUILTIN_NAME, msg), %$isfunction)
 
 
 /* -----------------------------------------------------------------------------