fixed D2->A2 problem