removed bugs due to services