Final fix to "meta-data" issue.