Fixed metadataResolver