Work on fix language settings bug
Work on fix language settings bug