Fix issues with multibyte character concating