Fix scoring issue when using the grid