diff --git a/VERSION21.cmake b/VERSION21.cmake
index 8c38fa841..32d2ff0f4 100644
--- a/VERSION21.cmake
+++ b/VERSION21.cmake
@@ -5,7 +5,7 @@
 
 set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version")
 set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version")
-set(MAXSCALE_VERSION_PATCH "15" CACHE STRING "Patch version")
+set(MAXSCALE_VERSION_PATCH "16" CACHE STRING "Patch version")
 
 # This should only be incremented if a package is rebuilt
 set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")
diff --git a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y b/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
index 85ffb5e85..ed086ab5d 100644
--- a/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
+++ b/query_classifier/qc_sqlite/sqlite-src-3110100/src/parse.y
@@ -615,6 +615,7 @@ columnid(A) ::= nm(X). {
   BINARY
   /*CASCADE*/ CAST CLOSE COLUMNKW COLUMNS COMMENT CONCURRENT /*CONFLICT*/
   DATA /*DATABASE*/ DEALLOCATE DEFERRED /*DESC*/ /*DETACH*/ DUMPFILE
+  /*EACH*/ END ENGINE ENUM EXCLUSIVE /*EXPLAIN*/
   /*EACH*/ END ENUM EXCLUSIVE /*EXPLAIN*/
   FIRST FLUSH /*FOR*/ FORMAT
   GLOBAL
diff --git a/query_classifier/test/maxscale.test b/query_classifier/test/maxscale.test
index 06a7b919c..a0d037df2 100644
--- a/query_classifier/test/maxscale.test
+++ b/query_classifier/test/maxscale.test
@@ -97,3 +97,6 @@ select id from db2.t1 where DATE_ADD("2017-06-15", INTERVAL 10 DAY) < "2017-06-1
 select id from db2.t1 where ADDDATE("2017-06-15", INTERVAL 10 DAY) < "2017-06-15";
 SELECT '2008-12-31 23:59:59' + INTERVAL 1 SECOND;
 SELECT '2005-01-01' - INTERVAL 1 SECOND;
+
+# MXS-1730
+SELECT id as engine FROM users WHERE id = 1;