Fixes end to not fire "end" event twice.
Merge #46 r=@tcr: Fixes end to not fire "end" event twice.