Please test the attached patch.

-- 
tejun