Add status check in handling to avoid multiple Term