Fix for pull request #4170
Merge pull request #4172 from pejakm/langcont2

Fix for pull request #4170