Hmm... this is proving to be much more difficult than I expected. :-(

Can you please try the attached patch?

Thanks.

-- 
tejun