work on #375
Update for latest changes in language module
Fix #375