fixing part 2/?