And fix trigger method in Listener class