Second half of self-vote fix