One last grammar change