fixes #946
Merge pull request #948 from enesakar/fix/3.0/issue-946

Fix/3.0/issue 946