AROMA: Move hardswap to proper block