merge fix for events