Fixed sudden death bug