Fix deactivation