Fix to align behavior for mode cancellation with other plugins