fixed charset issues