Cell ready, hotfix #1