Grammar changes (fixed #1)