yet another fix to surrogate pairs management