Bug fix to fetch