Fix issue with character encoding