Fix RS event/state usage