diff --git a/pcbnew/board.cpp b/pcbnew/board.cpp
index 771ae542a3..c464232c24 100644
--- a/pcbnew/board.cpp
+++ b/pcbnew/board.cpp
@@ -458,15 +458,15 @@ bool BOARD::ResolveTextVar( wxString* token, int aDepth ) const
 
     wxString var = *token;
 
-    if( GetTitleBlock().TextVarResolver( token, m_project ) )
-    {
-        return true;
-    }
-    else if( m_properties.count( var ) )
+    if( m_properties.count( var ) )
     {
         *token = m_properties.at( var );
         return true;
     }
+    else if( GetTitleBlock().TextVarResolver( token, m_project ) )
+    {
+        return true;
+    }
 
     if( GetProject() && GetProject()->TextVarResolver( token ) )
         return true;
diff --git a/pcbnew/pcbnew_jobs_handler.cpp b/pcbnew/pcbnew_jobs_handler.cpp
index 171a237f74..b545e75eab 100644
--- a/pcbnew/pcbnew_jobs_handler.cpp
+++ b/pcbnew/pcbnew_jobs_handler.cpp
@@ -547,6 +547,7 @@ int PCBNEW_JOBS_HANDLER::JobExportPdf( JOB* aJob )
     BOARD* brd = LoadBoard( aPdfJob->m_filename, true );
     loadOverrideDrawingSheet( brd, aPdfJob->m_drawingSheet );
     brd->GetProject()->ApplyTextVars( aJob->GetVarOverrides() );
+    brd->SynchronizeProperties();
 
     if( aPdfJob->m_outputFile.IsEmpty() )
     {