diff --git a/include/base/SMPFunction.h b/include/base/SMPFunction.h
index 69d5a5aae1c44ad4d42734dbd6ef4bee27de27cc..35355772aa7abbb7ebee120215164a946169378f 100644
--- a/include/base/SMPFunction.h
+++ b/include/base/SMPFunction.h
@@ -537,6 +537,7 @@ private:
 	std::set<STARS_ea_t> AllCallSites; // instructions that call this function
 	std::set<STARS_ea_t> TailReturnTargets; // tail call return points from this function; subset of ReturnTargets
 	std::set<STARS_ea_t> ReturnTargets; // instructions that this function could return to
+	std::set<SMPFunction *> UnresolvedCallers; // temp set to resolve during ComputeReturnTargets()
 	std::map<STARS_ea_t, int> JumpFollowNodesMap; // map COND_BRANCH addresses to their follow nodes when exiting if-then-elsif-else structures
 	std::map<STARS_ea_t, SMPBasicBlock *> InstBlockMap;
 	std::vector<SMPBasicBlock *> RPOBlocks;
diff --git a/src/base/SMPFunction.cpp b/src/base/SMPFunction.cpp
index 04848a33448a286500f119423a41f82cfffd4bdb..6ad051194eb7952c29228a4d6c0b3471963af772 100644
--- a/src/base/SMPFunction.cpp
+++ b/src/base/SMPFunction.cpp
@@ -9139,7 +9139,6 @@ bool SMPFunction::FindShadowingPoint(const STARS_ea_t ShadowCheckAddr, const STA
 // Determine inst ID set that func could return to, including tail call issues; return true if set changes
 bool SMPFunction::ComputeReturnTargets(bool FirstIteration) {
 	bool changed = false;
-	static set<SMPFunction *> UnresolvedCallers;
 	if ((!(this->FuncReturnsToCaller())) || this->IsLinkerStub()) {
 		this->ReturnTargetsComputed = true;
 	}