fix part1