#60: more encoding fixes