Fixes #928
Merge pull request #932 from Gravecorp/test

Fixes #928