Fixing bug with double fired events. Fixes #9