Patch up the grammar