Fix for empty string