Bug with empty cells fixed