fixes #2172
Merge pull request #2194 from sancar/fix/issue2172/master

fixes #2172