Fix Card image fetcher for Refactoring