Hotfix/5 redefine mediate method