Handle issues with metadata fetching #3