Minor fix on grid order change