repairing (swapping references and qualifiers)