Fix issue with multiple client registrations for events.