fixing part 2