added UTF-8 fix