Metadata scope bug fixed