Quick event handling fix