diff --git a/CHANGES b/CHANGES
index dede7a2668..94a548f5cb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+2.5-beta-21 | 2016-09-26 10:15:23 -0700
+
+  * Fix a debugger bug where it would not support statements like print(3).
+    Addresses BIT-1703. (Vlad Grigorescu)
+
 2.5-beta-19 | 2016-09-19 17:16:40 -0700
 
   * Kerberos updates (Vlad Grigorescu):
diff --git a/VERSION b/VERSION
index 5fdc83691e..4fc51f4a1e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-beta-19
+2.5-beta-21
diff --git a/src/Debug.cc b/src/Debug.cc
index 7f1250cf49..54a40c58d1 100644
--- a/src/Debug.cc
+++ b/src/Debug.cc
@@ -492,6 +492,9 @@ void tokenize(const char* cstr, string& operation, vector<string>& arguments)
 					++i;
 				}
 
+			else if ( ! delim && str[i] == '(' )
+				delim = ')';
+
 			else if ( ! delim && (str[i] == '\'' || str[i] == '"') )
 				delim = str[i];