Cell bugfix