fixing utf-8 support