fix for #210
Merge branch 'hotfix-6.1.1'