Merge branch 'master' into dynamic-phrase-tables

Conflicts:
	moses/InputPath.cpp
	moses/Word.cpp

1 files changed, 5 insertions, 3 deletions

diff --git a/moses/Word.cpp b/moses/Word.cpp
index d632492f5..f3a100b18 100644
--- a/moses/Word.cpp
+++ b/moses/Word.cpp
@@ -137,16 +137,18 @@ void Word::CreateUnknownWord(const Word &sourceWord)
 {
   FactorCollection &factorCollection = FactorCollection::Instance();
 
+  m_isNonTerminal = sourceWord.IsNonTerminal();
+
   for (unsigned int currFactor = 0 ; currFactor < MAX_NUM_FACTORS ; currFactor++) {
     FactorType factorType = static_cast<FactorType>(currFactor);
 
     const Factor *sourceFactor = sourceWord[currFactor];
     if (sourceFactor == NULL)
-      SetFactor(factorType, factorCollection.AddFactor(Output, factorType, UNKNOWN_FACTOR));
+      SetFactor(factorType, factorCollection.AddFactor(Output, factorType, UNKNOWN_FACTOR, m_isNonTerminal));
     else
-      SetFactor(factorType, factorCollection.AddFactor(Output, factorType, sourceFactor->GetString()));
+      SetFactor(factorType, factorCollection.AddFactor(Output, factorType, sourceFactor->GetString(), m_isNonTerminal));
   }
-  m_isNonTerminal = sourceWord.IsNonTerminal();
+
   m_isOOV = true;
 }