Oops, another bug fix ...