adding multibyte support