fix: event missing with rebase