Hot Fix for special characters