Repair for AOSPA-legacy