Fixing part2