Task 2 is fixed