Fix data race & make die actually work