event mixup fix