Fixing respond mediator issue -TOOLS-2549