attempt to add proper support for delegated events