Fix Metadata attribution issue.