Fixed #700
Merge pull request #766 from dvvrd/fix700

Fixed #700