Attempt to fix the double death issue