Fix for intl characters