This will be better to handle in the builders of the problematic packages, not in aggregation function.