Fix encoded chars issue