upgrade to new CustomEvent API, as Nightly broke old one