#8884394967050 fix sync according to events