Fixed self-kill crash