Fix for mb charset