Fixing events not firing on attempt > 1

Fixes: #98
(Shamelessly stolen from @bbn again, all credit to him!)