Fix on Services Handlers