Does the attached patch happen to fix the problem?

-- 
tejun