#7 CellSelector fix