fixed part 2