Possible fix to UTF-8 wrapping problems