diff --git a/samples/client/petstore/python/swagger_client/api_client.py b/samples/client/petstore/python/swagger_client/api_client.py
index 934cfda1c1a..24b1e52ff3e 100644
--- a/samples/client/petstore/python/swagger_client/api_client.py
+++ b/samples/client/petstore/python/swagger_client/api_client.py
@@ -253,7 +253,7 @@ class ApiClient(object):
                         for sub_data in data]
 
             if 'dict(' in klass:
-                sub_kls = re.match('dict\((.*), (.*)\)', klass).group(2)
+                sub_kls = re.match('dict\(([^,]*), (.*)\)', klass).group(2)
                 return {k: self.__deserialize(v, sub_kls)
                         for k, v in iteritems(data)}
 
diff --git a/samples/client/petstore/python/tests/test_deserialization.py b/samples/client/petstore/python/tests/test_deserialization.py
index 1121558adca..b205c2f165e 100644
--- a/samples/client/petstore/python/tests/test_deserialization.py
+++ b/samples/client/petstore/python/tests/test_deserialization.py
@@ -150,6 +150,19 @@ class DeserializationTests(unittest.TestCase):
         self.assertEqual(deserialized[0].name, "doggie0")
         self.assertEqual(deserialized[1].name, "doggie1")
 
+    def test_deserialize_nested_dict(self):
+        """ deserialize dict(str, dict(str, int)) """
+        data = {
+            "foo": {
+                "bar": 1
+            }
+        }
+
+        deserialized = self.deserialize(data, "dict(str, dict(str, int))")
+        self.assertTrue(isinstance(deserialized, dict))
+        self.assertTrue(isinstance(deserialized["foo"], dict))
+        self.assertTrue(isinstance(deserialized["foo"]["bar"], int))
+
     def test_deserialize_none(self):
         """ deserialize None """
         deserialized = self.deserialize(None, "datetime")