The attached patch seems to be a workaround for the problem reported.
Haven't tested it much, but from a first look it seems to work.

-- Christos