Fix for language changes