fixed death related issues