Fixed bug with cell