diff --git a/Simulator.cpp b/Simulator.cpp
index 059a6c5..e7bfe9f 100644
--- a/Simulator.cpp
+++ b/Simulator.cpp
@@ -272,7 +272,7 @@ Simulator::GetAxisInfoPos( int nI, string& sName, string& sToken, bool& bLinear,
    if ( m_pMchMgr == nullptr  ||  m_pGeomDB == nullptr)
       return false ;
   // numero assi di calcolo e ausiliari
-   int nAxisCount = int( m_AxesName.size()) ;
+   int nAxisCount = ( m_bEnabAxes ? int( m_AxesName.size()) : 0) ;
    int nAuxAxisCount = int( m_AuxAxesName.size()) ;
   // recupero i dati dell'asse
    if ( nI < 0  ||  nI >= nAxisCount + nAuxAxisCount)
@@ -555,6 +555,8 @@ Simulator::ResetAuxAxes( void)
    m_AuxAxesLinear.clear() ;
    m_AuxAxesVal.clear() ;
    m_AuxAxesEnd.clear() ;
+  // abilito assi principali
+   m_bEnabAxes = true ;
    return true ;
 }
 
@@ -1539,8 +1541,6 @@ Simulator::OnMoveEnd( void)
    bool bOk = m_pMachine->LuaCallFunction( ON_SIMUL_MOVE_END) ;
   // forzo aggiornamento posizione assi (possono essere stati mossi nello script)
    UpdateAxesPos() ;
-  // in ogni caso forzo riabilitazione assi attivi
-   m_bEnabAxes = true ;
    return bOk ;
 }