Fixing mediator publishing two events for activities. closes #101