Fixed task1