Other bug fix