Fixed Events not in order bug