fixes #2172
Merge pull request #2195 from sancar/fix/issue2172/maint3.x

fixes #2172