fix for metadata fetch