Fix issue with events becoming unbound

Fixes #submit