should fix the encoding problem and bug 353 for good