Fixed the "infinite click on death" bug.

Yay merging!