Bugfix - UTF7 was being displayed to user