diff --git a/internal/fuota/fuota.go b/internal/fuota/fuota.go
index 1eabec7..681da49 100644
--- a/internal/fuota/fuota.go
+++ b/internal/fuota/fuota.go
@@ -961,7 +961,8 @@ devLoop:
 				CID: fragmentation.FragSessionSetupReq,
 				Payload: &fragmentation.FragSessionSetupReqPayload{
 					FragSession: fragmentation.FragSessionSetupReqPayloadFragSession{
-						FragIndex: d.opts.FragmentationSessionIndex,
+						FragIndex:      d.opts.FragmentationSessionIndex,
+						McGroupBitMask: [4]bool{d.opts.MulticastGroupID == 0, d.opts.MulticastGroupID == 1, d.opts.MulticastGroupID == 2, d.opts.MulticastGroupID == 3},
 					},
 					NbFrag:   uint16(nbFrag),
 					FragSize: uint8(d.opts.FragSize),
@@ -1002,6 +1003,7 @@ devLoop:
 				Fields: hstore.Hstore{
 					Map: map[string]sql.NullString{
 						"frag_index":           sql.NullString{Valid: true, String: fmt.Sprintf("%d", d.opts.FragmentationSessionIndex)},
+						"McGroupBitMask":       sql.NullString{Valid: true, String: fmt.Sprintf("%d", uint32(1<<d.opts.MulticastGroupID))},
 						"nb_frag":              sql.NullString{Valid: true, String: fmt.Sprintf("%d", nbFrag)},
 						"frag_size":            sql.NullString{Valid: true, String: fmt.Sprintf("%d", d.opts.FragSize)},
 						"fragmentation_matrix": sql.NullString{Valid: true, String: fmt.Sprintf("%d", d.opts.FragmentationMatrix)},
@@ -1316,7 +1318,7 @@ func (d *Deployment) stepEnqueue(ctx context.Context) error {
 	}
 
 	// enqueue the payloads
-	for i, b := range payloads {
+	for _, b := range payloads {
 		_, err = as.MulticastGroupClient().Enqueue(ctx, &api.EnqueueMulticastGroupQueueItemRequest{
 			QueueItem: &api.MulticastGroupQueueItem{
 				MulticastGroupId: d.multicastGroupID,