Fix the Unicode issue not completely though