fixes #2009
Merge remote-tracking branch 'origin/master' into master-fix2009
Merge pull request #2019 from enesakar/master-fix2009

fix issue #2009