Part 2 fix