diff --git a/lib/swig/dynamic/mem.i b/lib/swig/dynamic/mem.i
index 382cee1f8..03c68d100 100644
--- a/lib/swig/dynamic/mem.i
+++ b/lib/swig/dynamic/mem.i
@@ -11,12 +11,12 @@
 
 /* Handle out typemap. */
 %typemap(argout) Handle* {
-	%append_output( SWIG_From_long(*$1) );
+	%append_output( SWIG_From_long_SS_long(*$1) );
 }
 
 /* Handle not as pointer is input. */
 %typemap(in) Handle {
-	SWIG_AsVal_long($input, (long*)&$1);
+	SWIG_AsVal_long_SS_long($input, (long*)&$1);
 }
 
 
diff --git a/lib/swig/dynamic/typemaps.i b/lib/swig/dynamic/typemaps.i
index 998c30226..3334228e9 100644
--- a/lib/swig/dynamic/typemaps.i
+++ b/lib/swig/dynamic/typemaps.i
@@ -1,6 +1,11 @@
 /*GoInt64* as function return typemap*/
 %typemap(argout) GoInt64* {
-	%append_output( SWIG_From_long( *$1 ) );
+	%append_output( SWIG_From_long_SS_long( *$1 ) );
+}
+
+/*GoUint64* as function return typemap*/
+%typemap(argout) GoUint64* {
+	%append_output( SWIG_From_unsigned_SS_long_SS_long( *$1 ) );
 }
 
 /*