Fixed Add Event Issue