Changed copy/move behaviour of event listener