Fixed self-killing