Put in the Ward fixes Remy suggested, fixes #65
It's untested, feel free to roll back if it makes problems :)