utf support fix