bug fix changes