Post-Challenge patch available here soon. This deserves more attention on my part than it gets. I should really get it done. :(