fixes #724
Merge pull request #728 from gurbuzali/fix/3.0/issue-724

Fix/3.0/issue 724