Current Version breaks Composite Products