Fix bug migrate AA to BJ