Metadata bug

Fixes 107

It was easier than I though!! Should be really easy to review!