Fix broken hardswap on AD 1.X