Bug Fix: CustomEvent Polyfill