Added UTF8 fix