San Francisco to Shanghai to Taipei, back to Shanghai & SFO...qualify?

I am going from San Francisco to Shanghai and returning to SFO 5 days later. This alone does not qualify since there is no 3rd Country. But if, on the 4th day, i go to Taipei, and return to Shanghai to pick up my flight back to SFO, this would qualify, correct? Taipei becomes my third country?