diff --git a/uppsrc/ide/Assist.cpp b/uppsrc/ide/Assist.cpp
index 9054255c3..823fa60a9 100644
--- a/uppsrc/ide/Assist.cpp
+++ b/uppsrc/ide/Assist.cpp
@@ -1,8 +1,8 @@
 #include "ide.h"
 
-#define LDUMP(x)    //DDUMP(x)
-#define LDUMPC(x)   //DDUMPC(x)
-#define LLOG(x)     //DLOG(x)
+#define LDUMP(x)    // DDUMP(x)
+#define LDUMPC(x)   // DDUMPC(x)
+#define LLOG(x)     // DLOG(x)
 
 class IndexSeparatorFrameCls : public CtrlFrame {
 	virtual void FrameLayout(Rect& r)                   { r.right -= 1; }
diff --git a/uppsrc/ide/Cpp.cpp b/uppsrc/ide/Cpp.cpp
index e645197bf..65196288a 100644
--- a/uppsrc/ide/Cpp.cpp
+++ b/uppsrc/ide/Cpp.cpp
@@ -1,8 +1,8 @@
 #include "ide.h"
 
-#define LDUMP(x)     //DDUMP(x)
-#define LDUMPC(x)    //DDUMPC(x)
-#define LLOG(x)      //DLOG(x)
+#define LDUMP(x)     // DDUMP(x)
+#define LDUMPC(x)    // DDUMPC(x)
+#define LLOG(x)      // DLOG(x)
 
 static Array<CppItem> sEmpty;
 
@@ -33,26 +33,26 @@ String ParseTemplatedType(const String& type, Vector<String>& tparam)
 	while(*s) {
 		if(*s == '<') {
 			s++;
-			int lvl = 0;
+			int lvl = 1;
 			String t;
 			while(*s) {
 				int c = *s++;
 				if(c == ',') {
-					if(lvl == 0 && t.GetCount()) {
+					if(lvl == 0) {
 						tparam.Add(t);
 						t.Clear();
 					}
 				}
 				else {
-					if(c == '>' && --lvl)
+					if(c == '>' && --lvl == 0)
 						break;
 					if(c == '<')
 						lvl++;
 					t.Cat(c);
 				}
 			}
-			if(t.GetCount())
-				tparam.Add(t);		
+			tparam.Add(t);
+			break;
 		}
 		else
 			r.Cat(*s++);
diff --git a/uppsrc/ide/version.h b/uppsrc/ide/version.h
index ed9db09ea..cd3b2c377 100644
--- a/uppsrc/ide/version.h
+++ b/uppsrc/ide/version.h
@@ -1 +1 @@
-#define IDE_VERSION    "810.r160"
+#define IDE_VERSION    "810.r161"