Finish fix lang. closes #2161