porting fix for #191
Merge branch 'hotfix-6.0.3'