The attached patch does indeed seem to solve the problem.

Now (really) on to Andrew's patches...

	Jeff