Fix collector bug
Add the dead ringer