bug fix on language change