Fix case with empty strings