Fix overlapping on the grid