Editing: AbstractListener.php