Fixed #721
Merge pull request #818 from dvvrd/fix721

Fixed #721