fix ordering task ordering issue