Fixing multibyte related bug