There isn't (at least not without mods), but at least the problem will fix itself after you get your last npc.
Know something? Err... Not really. It's just logic.The way you said that makes me think you might know something...c'mon, spill! Don't make me get out the thumbtacks.