Fixing metadata fetch