[subset] Adjust state transition after hintmask