Fixed Event Listener Order