another bug fix again