Fix matching host bug