server-side event handling fix