Fix for empty rows