Fixed #1144
Merge pull request #1153 from dvvrd/fix1144

Fixed #1144