Fixed comments in Listener