Another fix for encoding.