Fix issue #1108
Merge pull request #1684 from Alayan-stk/patch-1

Fix issue #1108