Fix issue with loading just metadata