As usual my message was lost. Here's the patch at least.