This will fix the regression added on
b068e20b.

See tests added at ff08d31e to a better understanding about the problem