Fixed issue with unfired event in servicesMapper