Fixing service definition