Fix on part 1