Fix encoding error
Merge branch 'fix-statuscodes-2'