Fixed #693
Merge pull request #716 from dvvrd/fix693

Fixed #693