Fix issue with empty strings