fixed public events bug