Refactor #9556 fix lang