Part B bug fix