Hi,

Below a patch that fixes this bug and with regression tests.

Comments welcome.

PS: I've signed the FSF paperwork my number is #793656