hopefully preventing double death issue