Fixing Fixes

Had some problems with the fixes I made earlier. These should be more
stable.
Merge branch 'master' of https://github.com/kuvick/DOEGame