Fixes bug where mediator was broken
Merge branch 'mediatorFix'