diff --git a/Source/Modules/go.cxx b/Source/Modules/go.cxx
index 637e5e3a6..6013fa15b 100644
--- a/Source/Modules/go.cxx
+++ b/Source/Modules/go.cxx
@@ -1624,8 +1624,13 @@ private:
       receiver = NULL;
     }
 
+    Swig_save("cgoGoWrapper", n, "type", "tmap:goout", NULL);
+    Setattr(n, "type", result);
+
     String *goout = goTypemapLookup("goout", n, "swig_r");
 
+    Swig_restore(n);
+
     bool add_to_interface = (interfaces && !is_constructor && !is_destructor && !is_static && !overname && checkFunctionVisibility(n, NULL));
 
     bool needs_wrapper = (gccgo_flag || receiver || is_constructor || is_destructor || parm_count > required_count);