Bugfix: infinite death fixed