data tracking polluted with event data bugfix