Fix #1083
Merge pull request #1092 from Arkni/fix-1083

Fix #1083