Fixed #783
Merge pull request #809 from dvvrd/fix783

Fixed #783