Fix for control characters