Possible fix to Metadata