Fixed #1156
Merge pull request #1166 from dvvrd/fix1156

Fixed #1156