Fixed issue with grids