fix tag mismatches