Perhaps a fix for metadata issues