Fixed to support unicode characters