latest from bitbucket
fix_lost_encoding