Does the attached patch fix your problem?

-- 
tejun