See attached patch


-- 
Tom Zander