fixing part 1