Fix 2D aggregate for nillable 2nd aggregate