Fix servicehandler