fixes #1070
Merge pull request #1107 from enesakar/master-issue1070

fixes #1070