fixes #1070
Merge pull request #1108 from enesakar/maint-issue1070

fixes issue #1070