Reduce double metadata definition

Fixes issue #7