Fix recursive metadata