--- a/src/lte/model/lte-enb-rrc.cc	Tue Apr 30 14:03:44 2013 +0100
+++ b/src/lte/model/lte-enb-rrc.cc	Fri May 03 11:04:28 2013 +0200
@@ -970,8 +970,13 @@
             {
               if (it->second->m_rsrq > bestNeighbourRsrq)
                 {
-                  bestNeighbour = it->second;
-                  bestNeighbourRsrq = it->second->m_rsrq;
+                  Ptr<NeighbourRelation> neighbourRelation = m_rrc->m_neighbourRelationTable[it->second->m_cellId];
+                  if ((neighbourRelation->m_noHo == false) &&
+                      (neighbourRelation->m_noX2 == false))
+                    {
+                      bestNeighbour = it->second;
+                      bestNeighbourRsrq = it->second->m_rsrq;
+                    }
                 }
             }