Fix MetadataContainerId Bug