Fix for special characters