fix events until the new event subscription mechanism goes in, as shared events have been broken