Another potential fix for joining while still in "match"