Listener order fix for immediate up