Fixed #705
Merge pull request #815 from dvvrd/fix705

Fixed #705