We discuss the convergence of the upstream phase-by-phase scheme (or upstream mobility scheme) towards the vanishing capillarity solution for immiscible incompressible two-phase flows in porous media made of several rock types. Troubles in the convergence where recently pointed out in [S. Mishra & J. Jaffré, Comput. Geosci., 2010] and [S. Tveit & I. Aavatsmark, Comput. Geosci, 2012]. In this paper, we clarify the notion of vanishing capillarity solution, stressing the fact that the physically relevant notion of solution differs from the one inferred from the results of [E. F. Kaasschieter, Comput. Geosci., 1999]. In particular, we point out that the vanishing capillarity solution de- pends on the formally neglected capillary pressure curves, as it was recently proven in by the authors [B. Andreianov & C. Canc'es, Comput. Geosci., 2013]. Then, we propose a numerical procedure based on the hybridization of the interfaces that converges towards the vanishing capillarity solution. Numerical illustrations are provided.