Fixed grid misplacement issue