Fixed issue with deathwindow