Encoding fix, finally