some fixes of Factory task