bug fix finished