Implement DeathEvent, close #2