aggregation / composition fix