Fixed #980
Merge pull request #981 from dvvrd/fix980

Fixed #980