Gah, fix it, and test it