another bug fix attempt