Fix ServiceHandler