Fixes #1197
Merge pull request #1220 from siad007/patch-10

Fixed #1197