FIX concurrent modification of metadata