And another bug fix ...