Fixes #161 - Mediator synchronisation