Fix part 2