fixes #950
fixes #950
Merge pull request #951 from enesakar/fix/3.0/issue-950

fixes #950