Fix event handling, add isolated event