fix for custom event context