diff --git a/library/ecp.c b/library/ecp.c
index 233c2eb..cc79b77 100644
--- a/library/ecp.c
+++ b/library/ecp.c
@@ -69,6 +69,8 @@
     if( grp == NULL )
         return;
 
+    grp->id = 0;
+
     mpi_init( &grp->P );
     mpi_init( &grp->B );
     ecp_point_init( &grp->G );
@@ -632,7 +634,7 @@
      * Next two bytes are the namedcurve value
      */
     buf[0] = grp->id >> 8;
-    buf[1] = grp->id && 0xFF;
+    buf[1] = grp->id & 0xFF;
 
     return 0;
 }