Fix dispatchEvent | Signal only for internal dev