diff --git a/Examples/test-suite/c/Makefile.in b/Examples/test-suite/c/Makefile.in
index c23e2a71f..547dc9cad 100644
--- a/Examples/test-suite/c/Makefile.in
+++ b/Examples/test-suite/c/Makefile.in
@@ -56,6 +56,7 @@ FAILING_CPP_TESTS := \
     grouping \
     import_nomodule \
     li_attribute \
+    li_attribute_template \
     li_boost_shared_ptr_attribute \
     li_std_deque \
     li_std_wstring \
diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c
index 14d41a001..75bec61fd 100644
--- a/Source/Preprocessor/cpp.c
+++ b/Source/Preprocessor/cpp.c
@@ -929,14 +929,14 @@ static String *expand_macro(String *name, List *args, String *line_file) {
       /* Non-standard mangle expansions.  
          The #@Name is replaced by mangle_arg(Name). */
       if (strstr(Char(ns), "\004")) {
-	String *marg = Swig_name_type(arg);
+	String *marg = Swig_string_mangle(arg);
 	Clear(temp);
 	Printf(temp, "\004%s", aname);
 	Replace(ns, temp, marg, DOH_REPLACE_ID_END);
 	Delete(marg);
       }
       if (strstr(Char(ns), "\005")) {
-	String *marg = Swig_name_type(arg);
+	String *marg = Swig_string_mangle(arg);
 	Clear(temp);
 	Clear(tempa);
 	Printf(temp, "\005%s", aname);