More checks around detachement.