--- a/src/states.c	Mon Nov 12 13:24:17 2007 +0100
+++ b/src/states.c	Mon Nov 12 14:38:34 2007 +0100
@@ -288,6 +288,11 @@
       offset ++;
     }
   }
+
+  /* Update EMCY COB-ID if already set to default*/
+  if(*d->error_cobid == *d->bDeviceNodeId + 0x80)
+    *d->error_cobid = nodeId + 0x80;
+
   /* bDeviceNodeId is defined in the object dictionary. */
   *d->bDeviceNodeId = nodeId;
 }