fixup! Implement CustomEvent (#2173)