Fixed: task2