fixed local event handling