Fixed Event Trigger bug