Fix bug with empty string