Mediator problems fixed