fixing part1