General
Fixed an issue where event data was being overwritten