Fixed #740
Merge pull request #757 from dvvrd/fix740

Fixed #740