More aggressive way to force proper encoding for binary values