Patch attached.

-- 
Peter Oliver