Bug renumbering. --tjc