Fix an Event Handling bug