Thanks, does the attached (untested) patch fix things for you?