Nope, that's what I meant. It's a bit confusing but I think this is fine -- certainly it's clearer than it was before.