fixed last tasks