fix event duplication issue