Fix #920
Merge pull request #929 from Arkni/fix_920

Fix #920