Actually... does the attached patch fix things for you?

	Jeff