Actually fixed the encoding issue

Needs testing