Fix empty cells issues