Attempt to re-fix issue #10, tested and working

There was one error left. This should fix it.