Fix CEvent