Fixed circular dependency on Fog