fixes #654
Merge pull request #766 from enesakar/fix/3.0/issue-654

fixes #654