diff --git a/plato/samplers/sample_quantity_noniid.py b/plato/samplers/sample_quantity_noniid.py
index b35aba055..0e506ee88 100644
--- a/plato/samplers/sample_quantity_noniid.py
+++ b/plato/samplers/sample_quantity_noniid.py
@@ -72,7 +72,7 @@ def __init__(self, datasource, client_id, testing):
             min_partition_size=min_partition_size,
             concentration=concentration,
             num_clients=total_clients,
-        )[client_id]
+        )[client_id-1]
 
     def sample_quantity_skew(
         self,
@@ -87,7 +87,7 @@ def sample_quantity_skew(
             total_size=dataset_size,
             concentration=concentration,
             min_partition_size=min_partition_size,
-            number_partitions=num_clients,
+            number_partitions=num_clients+1,
             is_extend_total_size=True,
         )
 
@@ -99,7 +99,7 @@ def sample_quantity_skew(
         )
 
         # obtain the assigned subdataset indices for current client
-        clients_assigned_idxs = np.split(extended_dataset_indices, proportions_range)
+        clients_assigned_idxs = np.split(extended_dataset_indices, proportions_range)[:-1]
 
         return clients_assigned_idxs