fixed potential event duplication
Merge pull request #70 from Mauru/master

fixed potential event duplication