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

There was one error left. This should fix it.