revert and fixed the death bug