Perhaps a fix for metadata issues
Merge pull request #1950 from lukecampbell/metadata

TEST - Perhaps a fix for metadata issues