Hopefully last bug in event ordering