Fix vigor adds/removes