Fixed issue for multibyte languages