resolve retagging issue