diff --git a/wrap/Method.cpp b/wrap/Method.cpp
index 49d90378d..1feb0f70f 100644
--- a/wrap/Method.cpp
+++ b/wrap/Method.cpp
@@ -58,7 +58,7 @@ string Method::wrapper_call(FileWriter& wrapperFile, Str cppClassName,
   // check arguments
   // extra argument obj -> nargin-1 is passed !
   // example: checkArguments("equals",nargout,nargin-1,2);
-  wrapperFile.oss << "  checkArguments(\"" << name_ << "\",nargout,nargin-1,"
+  wrapperFile.oss << "  checkArguments(\"" << matlabName() << "\",nargout,nargin-1,"
       << args.size() << ");\n";
 
   // get class pointer
diff --git a/wrap/Module.cpp b/wrap/Module.cpp
index ac0e0a579..ee1e78742 100644
--- a/wrap/Module.cpp
+++ b/wrap/Module.cpp
@@ -162,7 +162,7 @@ void Module::parseMarkup(const std::string& data) {
   vector<Qualified> templateArgValues;
   Rule templateArgValue_p =
     (*(namespace_name_p[push_back_a(templateArgValue.namespaces)] >> str_p("::")) >>
-    className_p[assign_a(templateArgValue.name)])
+    (className_p | eigenType_p)[assign_a(templateArgValue.name)])
     [push_back_a(templateArgValues, templateArgValue)]
     [clear_a(templateArgValue)];