diff --git a/tools/apps/hgjson/DlgRange.cpp b/tools/apps/hgjson/DlgRange.cpp
index 5de133e..5811907 100644
--- a/tools/apps/hgjson/DlgRange.cpp
+++ b/tools/apps/hgjson/DlgRange.cpp
@@ -232,6 +232,8 @@ void CDlgRange::OnNMDblclkList1(NMHDR* pNMHDR, LRESULT* pResult)
 			cv.val = buf;
 			list_.GetItemText(item, 1, buf, _countof(buf) - 1);
 			cv.cond = buf;
+			if (cv.cond.find(L"default:") == std::wstring::npos)
+				cv.cond.insert(0, L"default:");
 			init_.push_back(cv);
 		}
 		else if (ret == IDNO)
@@ -401,8 +403,11 @@ void CDlgRange::OnBnClickedOk()
 			val.cond = buf;
 			if (val.cond.find(L"default:") == 0)
 			{
-				val.cond.erase(0, lstrlenW(L"default:"));
+				std::wstring c(val.cond);
+				val.cond = L"default";
 				init_.push_back(val);
+				val.cond = c;
+				val.cond.erase(0, lstrlenW(L"default:"));
 			}
 			if (range)
 			{
@@ -506,6 +511,7 @@ void CDlgRange::OnBnClickedOk()
 			GotoDlgCtrl(GetDlgItem(IDC_COMBO_VAL));
 			return;
 		}
+		cv.cond = L"default:";
 		init_.push_back(cv);
 	}
 
diff --git a/tools/solution/Release/hgjson.exe b/tools/solution/Release/hgjson.exe
index 52888de..76ada38 100644
Binary files a/tools/solution/Release/hgjson.exe and b/tools/solution/Release/hgjson.exe differ