improve de-activation detection