Add buffer to events to avoid repeated events at the same execution frame
hotfix: Partially fixes multiple update. Still being called twice