(Seemingly) fixed event handling