Fixed #1155
Merge pull request #1161 from dvvrd/fix1155

Fixed #1155