Fixed - that was subtly breaking lots of things.