fix service events