fix CustomEvent mess