Pierre writes too good code. We need to kludge it :(