Fix for special case when event ordering is messed up
Fix issue with regular changes not triggering resort