Merge pull request #973 from TheBlueMatt/2021-06-fix-broken-event-ser