Fixing issue with export of event-listener