Fixed the collision death queue
Merged branch