Fixing bug in event order and versioning.