Fixed #973
Merge pull request #990 from dvvrd/fix973

Fixed #973