Fixed issue with event service firing the wrong event.