FIxing grammar