Fixed - and actually this exposed another issue in the tests which I've also fixed.