fixes #891
Merge pull request #893 from enesakar/fix/3.0/issue891

Fix/3.0/issue891