diff --git a/pcbnew/class_board.cpp b/pcbnew/class_board.cpp
index 05188bf431..87ec8d01e8 100644
--- a/pcbnew/class_board.cpp
+++ b/pcbnew/class_board.cpp
@@ -495,7 +495,8 @@ EDA_BaseStruct* BOARD::FindPadOrModule( const wxPoint& refPos, int layer )
     // search only for PADs first, then MODULES, and preferably a layer match
     static const KICAD_T scanTypes[] = { TYPEPAD, TYPEMODULE, EOT };
 
-    IterateForward( m_Modules, &inspector, &refPos, scanTypes );
+    // visit this BOARD with the above inspector
+    Visit( &inspector, &refPos, scanTypes );
     
     return inspector.found;
 }
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index c4f6f44908..98e6304d0a 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -235,7 +235,7 @@ int WinEDA_PcbFrame::LoadOnePcbFile( const wxString& FullFileName, wxDC* DC, boo
     g_SaveTime = time( NULL );
 
     
-#if 1 && defined(DEBUG) 
+#if 0 && defined(DEBUG) 
     // note this seems to freeze up pcbnew when run under the kicad project 
     // manager.  runs fine from command prompt.
     // output the board object tree to stdout: