Also, fixed a critical bug.

I imagine how many of these there will be in future...