Fixed #698
Merge pull request #748 from dvvrd/fix698

Fixed #698