Fixing issue with event context being whiped out