Fix logic selecting a new architecture. Use the sequence: