Bug fixed with cells