Fix: left legacy tag loop in