Grammar - Fixes #1598