Fixed #725
Merge pull request #761 from dvvrd/fix725

Fixed #725