Fixed bug in grammar. For #37