Fix CellList