Listener corrected