Fix for legacy grids