fixed a issue with unmatched events