ENYO-3118:  fix for charset-related hiccups
ENYO-3118:  fix for charset-related hiccups

mcanthony/ares-project,mcanthony/ares-project,mcanthony/ares-project,enyojs/ares-project,enyojs/ares-project,mcanthony/ares-project,mcanthony/ares-project,enyojs/ares-project,mcanthony/ares-project,enyojs/ares-project,enyojs/ares-project