Fix #302 Grids fail to split/reform correctly