pr fix part 1