fix listeners for events with arguments