Should fix #928
Merge pull request #1027 from Gravecorp/test

Should fix #928