Improve "on death" action by making it work in all possible situations.