Work on fix language settings bug