FINALLY fixed the error of death