Fixed #709
Merge pull request #816 from dvvrd/fix709

Fixed #709