fix a hack in the grammar