I think you are correct two pieces, I think it is also straight, the piece that broke may still be in the hose underneath, that was a second issue to me working on the oil. I really think it is a through hole connector type it looks in my old photo to have a notch in the plastic? I will update...