Patch Set 1:

Sorry, Remy, I was not aware anymore of your patch proposal!

The solution looks similar, but I had not looked into your patch before (I know I should have done, I'll take more care of reviewing in future...)