Fix for invalid characters in data