Fixing issue #7 for metadata