Fix part.2