Fixed double throwing of event