Fixed event handling bleed through