Fix activatable deactivation being unreliable