back fit of 1.4.5 double encoding fix