diff --git a/wrap/ReturnType.cpp b/wrap/ReturnType.cpp
index 9ec30f7df..74dc328e0 100644
--- a/wrap/ReturnType.cpp
+++ b/wrap/ReturnType.cpp
@@ -74,7 +74,7 @@ void ReturnType::emit_cython_pxd(FileWriter& file) const {
   } else {
     if (isPtr) cythonType = "shared_ptr[" + typeName + "]";
   }
-  file.oss << cythonType << " ";
+  file.oss << cythonType;
 }
 
 /* ************************************************************************* */
diff --git a/wrap/ReturnValue.cpp b/wrap/ReturnValue.cpp
index d857f4a93..2e347d669 100644
--- a/wrap/ReturnValue.cpp
+++ b/wrap/ReturnValue.cpp
@@ -74,10 +74,12 @@ void ReturnValue::emit_cython_pxd(FileWriter& file) const {
     file.oss << "pair[";
     type1.emit_cython_pxd(file);
     file.oss << ",";
-    type1.emit_cython_pxd(file);
-    "] ";
+    type2.emit_cython_pxd(file);
+    file.oss << "] ";
+  } else {
+      type1.emit_cython_pxd(file);
+      file.oss << " ";
   }
-  else type1.emit_cython_pxd(file);
 }
 
 /* ************************************************************************* */