fix A existed BUGs