fixed potential event duplication

Update 1.2 - fixed potential event duplication