Slightly improved patch attached.