fix identifier & disable events for now