diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
index 64c73af..59d6b35 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
+++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
@@ -1032,6 +1032,13 @@
     (<DATASET>|<COLLECTION>)
 }
 
+void DatasetToken() throws ParseException:
+{
+}
+{
+    Dataset()
+}
+
 DatasetDecl CreateDatasetStatement(Token startStmtToken) throws ParseException:
 {
   DatasetDecl stmt = null;
@@ -2680,7 +2687,7 @@
   Pair<DataverseName,Identifier> nameComponents = null;
 }
 {
-  <ANALYZE> { startToken = token; } Dataset() nameComponents = QualifiedName()
+  <ANALYZE> { startToken = token; } DatasetToken() nameComponents = QualifiedName()
   (
     stmt = AnalyzeDatasetDropStatement(startToken, nameComponents.first, nameComponents.second)
     | stmt = AnalyzeDatasetStatement(startToken, nameComponents.first, nameComponents.second)