fixes issue #1957
Merge pull request #1964 from sancar/fix/issue1957/maint3.x

fixes issue #1957