Event schema fix