Added support for surrogate pairs