Fixing lang vars see #6983