fixes #652
Merge pull request #973 from gurbuzali/fix/3.x/issue652

fixes #652