Fixing which event is being serviced (which fixed infinite loop issue).