Really hacky fix for death bug