Fixes to cells - now it's work like previous version