Control Fetcher Fix

This is a fix for #491