fixed potential event duplication