Oh dear. I think that your patch should come before my silly repetition of that bug (going to push).