Fixing for language changes.