Fix bug with duplicated meta-data