Begin fix lang. references #2161