diff --git a/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g b/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g
index 5d8cdf68..0951ba42 100644
--- a/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g
+++ b/src/main/antlr3/com/joestelmach/natty/generated/DateParser.g
@@ -75,7 +75,7 @@ date_time
   
 date_time_separator
   : WHITE_SPACE (AT WHITE_SPACE)?
-  | COMMA WHITE_SPACE? (AT WHITE_SPACE)?
+  | WHITE_SPACE? COMMA WHITE_SPACE? (AT WHITE_SPACE)?
   | T
   ;
   
diff --git a/src/test/java/com/joestelmach/natty/DateTimeTest.java b/src/test/java/com/joestelmach/natty/DateTimeTest.java
index ac4152b6..300ab7da 100644
--- a/src/test/java/com/joestelmach/natty/DateTimeTest.java
+++ b/src/test/java/com/joestelmach/natty/DateTimeTest.java
@@ -43,6 +43,7 @@ public void testSpecific() throws Exception {
     validateDateTime("April 20 10", 4, 20, 2012, 10, 0, 0);
     validateDateTime("April 20 at 10 am", 4, 20, 2012, 10, 0, 0);
     validateDateTime("Mar 16, 2015 3:33:39 PM", 3, 16, 2015, 15, 33, 39);
+    validateDateTime("15-Sep-2015 , 10:00 AM", 9, 15, 2015, 10, 00, 00);
   }
 
   @Test