diff --git a/src/if_py_both.h b/src/if_py_both.h
index 530c6d8..6c1aa7f 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -1284,9 +1284,10 @@
 	selfdictObject = PyDict_GetItemString(kwargs, "self");
 	if (selfdictObject != NULL)
 	{
-	    if (!PyDict_Check(selfdictObject))
+	    if (!PyMapping_Check(selfdictObject))
 	    {
-		PyErr_SetString(PyExc_TypeError, _("'self' argument must be a dictionary"));
+		PyErr_SetString(PyExc_TypeError,
+				   _("'self' argument must be a dictionary"));
 		clear_tv(&args);
 		return NULL;
 	    }
diff --git a/src/version.c b/src/version.c
index 9ce83e7..ed205bb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    611,
+/**/
     610,
 /**/
     609,