Fixed #718
Merge pull request #753 from dvvrd/fix718

Fixed #718