Patch attached.

-- 
Andrew.