Update to fix overwritting event data