Fixed issue with event service callback