Add a special case for empty rows