diff --git a/vtl-transform/src/main/java/it/bancaditalia/oss/vtl/impl/transform/aggregation/AggregateTransformation.java b/vtl-transform/src/main/java/it/bancaditalia/oss/vtl/impl/transform/aggregation/AggregateTransformation.java
index 085b7a90d..179b90611 100644
--- a/vtl-transform/src/main/java/it/bancaditalia/oss/vtl/impl/transform/aggregation/AggregateTransformation.java
+++ b/vtl-transform/src/main/java/it/bancaditalia/oss/vtl/impl/transform/aggregation/AggregateTransformation.java
@@ -158,7 +158,7 @@ protected VTLValue evalOnDataset(MetadataRepository repo, DataSet dataset, VTLVa
 			else if (dp.size() == 1)
 			{
 				DataSetMetadata srcMeta = dataset.getMetadata();
-				builder = builder.add(getCompFor(srcMeta.getMeasures().iterator().next(), repo, srcMeta), dp.values().iterator().next());
+				builder = builder.add(getCompFor(srcMeta.getMeasures().iterator().next(), repo, (DataSetMetadata) metadata), dp.values().iterator().next());
 			}
 			else
 				throw new IllegalStateException();
diff --git a/vtl-types/src/main/java/it/bancaditalia/oss/vtl/impl/types/dataset/AbstractDataSet.java b/vtl-types/src/main/java/it/bancaditalia/oss/vtl/impl/types/dataset/AbstractDataSet.java
index 2d56773e9..e342183ac 100644
--- a/vtl-types/src/main/java/it/bancaditalia/oss/vtl/impl/types/dataset/AbstractDataSet.java
+++ b/vtl-types/src/main/java/it/bancaditalia/oss/vtl/impl/types/dataset/AbstractDataSet.java
@@ -285,8 +285,7 @@ protected Stream<DataPoint> streamDataPoints()
 			{
 				createCache(keys, groupCollector);
 
-				return Utils.getStream(cache)
-						.map(splitting((k, v) -> finisher.apply(v, k)));
+				return Utils.getStream(cache).map(splitting((k, v) -> finisher.apply(v, k)));
 			}
 
 			private synchronized void createCache(Set<DataStructureComponent<Identifier, ?, ?>> keys,