added retry if target not found and disabling of non-dispatched events