fixed for new Cell
fixed for compiling