You could theoretically go back to camp to always find NPC's waiting, but unfortunately that doesn't work in my case.

I've seen a lot of suggested fixes but nothing solid. Even killing ourselves doesn't work.