Fix odd bug of empty cells