Comply with current grammar