Update eventing code to avoid race condition