Fix mapping, restore the grid