Fixed #724
Merge pull request #762 from dvvrd/fix724

Fixed #724