Fix regression on grid