How about something like the attached patch?

-- Simen