Make the grammar fix to index also :)