Fixed #772
Merge pull request #821 from dvvrd/fix772

Fixed #772