fixes #685
Merge pull request #735 from enesakar/fix/3.0/issue-685

fixes #685