VID-650 fixing the grid