Fix a bug with empty string