Fixed #1033
Merge pull request #1036 from dvvrd/fix1033

Fixed #1033