And here's a patch (to be applied on top of the last) which prevents