fixes #929
Merge pull request #932 from gurbuzali/fix/3.x/issue929

Fix/3.x/issue929