Fix matching (#segments)