diff --git a/CHANGES.current b/CHANGES.current
index bf8c4d644..36b1b3933 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 3.0.9 (in progress)
 ===========================
 
+2016-04-02: derkuci
+            [Python] Patch #610 to fix #607. 
+            Fix single arguments when using python -builtin -O with %feature("compactdefaultargs")
+
 2016-03-31: wsfulton
             Fixes #594. Fix assertion for some languages when wrapping a C++11 enum class that
             is private in a class.
diff --git a/Examples/test-suite/compactdefaultargs.i b/Examples/test-suite/compactdefaultargs.i
index b2b07c5f8..af96fbe23 100644
--- a/Examples/test-suite/compactdefaultargs.i
+++ b/Examples/test-suite/compactdefaultargs.i
@@ -30,6 +30,7 @@ public:
   static const double PUBLIC_DEFAULT;
   Defaults2(int a = PRIVATE_DEFAULT) {}
   double ret(double d = PUBLIC_DEFAULT) { return d; }
+  double nodefault(int x) { return x; }
 };
 %}
 
diff --git a/Examples/test-suite/python/compactdefaultargs_runme.py b/Examples/test-suite/python/compactdefaultargs_runme.py
index e81c8d173..1096619f4 100644
--- a/Examples/test-suite/python/compactdefaultargs_runme.py
+++ b/Examples/test-suite/python/compactdefaultargs_runme.py
@@ -17,3 +17,6 @@ if defaults2.ret(10.0) != 10.0:
 
 if defaults2.ret() != -1.0:
     raise RuntimeError
+
+if defaults2.nodefault(-2) != -2:
+    raise RuntimeError