matchup bug fix