[fixed?] PersistentEvents

Change-Id: Ib85dde645889be75340872db7acd5a90e49e742f