Fixed #1086
Merge pull request #1136 from dvvrd/fix1086

Fixed #1086