Fixing language change