Fix to Grid indexing