Fixes the double-firing
Merge pull request #1 from benizi/fix-events

Fixes the double-firing