This changes make the out-of-order events less likely. Still not 100% fixed