Untested encoding fix