Fix part 2.2