EventTransformer fix