Fix part.1