diff --git a/SWIG/Source/Swig/typesys.c b/SWIG/Source/Swig/typesys.c
index d90a863bf..9adfe6530 100644
--- a/SWIG/Source/Swig/typesys.c
+++ b/SWIG/Source/Swig/typesys.c
@@ -1070,7 +1070,7 @@ SwigType_isclass(SwigType *t) {
       isclass = 1;
     }
     /* Hmmm. Not a class.  If a template, it might be uninstantiated */
-    if (SwigType_istemplate(qtys)) {
+    if (!isclass && SwigType_istemplate(qtys)) {
       String *tp = SwigType_templateprefix(qtys);
       isclass = SwigType_isclass(tp);
       Delete(tp);