fixed remove issue