Fixing issue #1090
Fixed #1090
Merge pull request #1278 from Varriount/fix-1090

Fix 1090