mediator fix