diff --git a/moses-cmd/src/Main.cpp b/moses-cmd/src/Main.cpp
index e0956abf6..1bf0c15d9 100644
--- a/moses-cmd/src/Main.cpp
+++ b/moses-cmd/src/Main.cpp
@@ -151,7 +151,7 @@ int main(int argc, char* argv[])
 
 		IFVERBOSE(2) { PrintUserTime("Sentence Decoding Time:"); }
     
-		manager.CalcDecoderStatistics(staticData);
+		manager.CalcDecoderStatistics();
 		staticData.CleanUpAfterSentenceProcessing();      
     
 	}
diff --git a/moses/src/Manager.cpp b/moses/src/Manager.cpp
index 54e139c15..f64897b82 100755
--- a/moses/src/Manager.cpp
+++ b/moses/src/Manager.cpp
@@ -363,12 +363,12 @@ void Manager::CalcNBest(size_t count, LatticePathList &ret,bool onlyDistinct) co
 	}
 }
 
-void Manager::CalcDecoderStatistics(const StaticData& staticData) const 
+void Manager::CalcDecoderStatistics() const 
 {
   const Hypothesis *hypo = GetBestHypothesis();
 	if (hypo != NULL)
   {
-  	staticData.GetSentenceStats().CalcFinalStats(*hypo);
+		StaticData::Instance().GetSentenceStats().CalcFinalStats(*hypo);
     IFVERBOSE(2) {
 		 	if (hypo != NULL) {
 		   	string buff;
diff --git a/moses/src/Manager.h b/moses/src/Manager.h
index ac68e6426..9db4260ad 100755
--- a/moses/src/Manager.h
+++ b/moses/src/Manager.h
@@ -98,5 +98,5 @@ public:
 	/***
 	 * to be called after processing a sentence (which may consist of more than just calling ProcessSentence() )
 	 */
-	void CalcDecoderStatistics(const StaticData& staticData) const;
+	void CalcDecoderStatistics() const;
 };
diff --git a/moses/src/PhraseDictionaryMemory.cpp b/moses/src/PhraseDictionaryMemory.cpp
index 1f252fee3..578f073f8 100755
--- a/moses/src/PhraseDictionaryMemory.cpp
+++ b/moses/src/PhraseDictionaryMemory.cpp
@@ -42,9 +42,10 @@ bool PhraseDictionaryMemory::Load(const std::vector<FactorType> &input
 																			, const vector<float> &weight
 																			, size_t tableLimit
 																			, const LMList &languageModels
-														          , float weightWP
-														          , const StaticData& staticData)
+														          , float weightWP)
 {
+	const StaticData &staticData = StaticData::Instance();
+
 	m_tableLimit = tableLimit;
 	m_filePath = filePath;
 
diff --git a/moses/src/PhraseDictionaryMemory.h b/moses/src/PhraseDictionaryMemory.h
index 72b7b428e..932fced6b 100755
--- a/moses/src/PhraseDictionaryMemory.h
+++ b/moses/src/PhraseDictionaryMemory.h
@@ -51,8 +51,7 @@ public:
 								, const std::vector<float> &weight
 								, size_t tableLimit
 								, const LMList &languageModels
-						    , float weightWP
-								, const StaticData& staticData);
+						    , float weightWP);
 	
 	const TargetPhraseCollection *GetTargetPhraseCollection(const Phrase &source) const;
 
diff --git a/moses/src/StaticData.cpp b/moses/src/StaticData.cpp
index 8f2be6eca..92dc4abe8 100755
--- a/moses/src/StaticData.cpp
+++ b/moses/src/StaticData.cpp
@@ -619,8 +619,7 @@ bool StaticData::LoadPhraseTables()
 								 , weight
 								 , maxTargetPhrase[index]
 								 , GetAllLM()
-								 , GetWeightWordPenalty()
-								 , *this))
+								 , GetWeightWordPenalty()))
 				{
 					delete pd;
 					return false;