Attempt to fix dead man bug