diff --git a/pcbnew/collectors.cpp b/pcbnew/collectors.cpp
index 040191cb54..0d4eff7ec7 100644
--- a/pcbnew/collectors.cpp
+++ b/pcbnew/collectors.cpp
@@ -418,17 +418,11 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_ITEM* testItem, void* testData )
                             goto exit;
                         }
                     }
-                    else if( module )
-                    {
-                        if( module->HitTest( m_RefPos ) && module->HitTestAccurate( m_RefPos ) )
-                        {
-                            Append( item );
-                            goto exit;
-                        }
-                    }
                     else if( item->HitTest( m_RefPos ) )
                     {
-                        Append( item );
+                        if( !module || module->HitTestAccurate( m_RefPos ) )
+                            Append( item );
+
                         goto exit;
                     }
                 }
@@ -470,14 +464,6 @@ SEARCH_RESULT GENERAL_COLLECTOR::Inspect( EDA_ITEM* testItem, void* testData )
                             goto exit;
                         }
                     }
-                    else if( module )
-                    {
-                        if( module->HitTest( m_RefPos ) && module->HitTestAccurate( m_RefPos ) )
-                        {
-                            Append2nd( item );
-                            goto exit;
-                        }
-                    }
                     else if( item->HitTest( m_RefPos ) )
                     {
                         Append2nd( item );