Better approach to the utf-8 fix