issue #21672: Fix event handling broken by previous commit.