Fix issue with encoding