Thanks Nicolas, great catch!
I'll try to add a test, having your fix as guidance will be very useful.