Fix issue with event persister