Resolve problems with new Cell base class