bug fix[2]