Fix for utf-8 conversion issue