and another bug fix