Encoding fix 3