Fix origin composition.