--- a/src/lss.c	Wed Jun 18 10:57:47 2008 +0200
+++ b/src/lss.c	Wed Jun 18 11:15:17 2008 +0200
@@ -36,13 +36,14 @@
 **
 */
 
-#ifdef CO_ENABLE_LSS
 
 #include "data.h"
 #include "lss.h"
 #include "canfestival.h"
 #include "sysdep.h"
 
+#ifdef CO_ENABLE_LSS
+
 //#define LSS_TIMEOUT_MS	(TIMEVAL)1000  /* ms */
 //#define LSS_FS_TIMEOUT_MS	(TIMEVAL)100  /* ms */
 
@@ -645,7 +646,6 @@
 					setState(d, Initialisation);
 				}
 				else{/* The nodeID will be changed on NMT_Reset Request*/
-					setNodeId(d, d->lss_transfer.nodeID);
 				}
 			}
 			d->lss_transfer.mode=LSS_WAITING_MODE;

--- a/src/nmtSlave.c	Wed Jun 18 10:57:47 2008 +0200
+++ b/src/nmtSlave.c	Wed Jun 18 11:15:17 2008 +0200
@@ -75,10 +75,6 @@
       case NMT_Reset_Node:
          if(d->NMT_Slave_Node_Reset_Callback != NULL)
             d->NMT_Slave_Node_Reset_Callback(d);
-#ifdef CO_ENABLE_LSS
-  		if(getNodeId(d)!=d->lss_transfer.nodeID)
-  			setNodeId(d, d->lss_transfer.nodeID);
-#endif
         setState(d,Initialisation);
         break;