Issues with language change fixed