Fixed issue with misplaced empty cell