Fixing activation/deactivation behavior