Fixed events ordering