Trying again for encoding fixes