Simon's patch suggestion