Fetch Bug fix