Fix compoentn lang. closes #2149