fixes #946
Merge pull request #947 from enesakar/fix/3.x/issue-946

fixes #946