Fixed hardcoded escaping