Fix matching solutions