Fixed death issue