Added multi-byte support.