Fixed #800
Merge pull request #841 from dvvrd/fix800

Fixed #800