Minor bugfix for metadata mapping