Fix illegal events sequence on OJNs