Actually added fix to death issue