Fix for circular dependencies from Issue#7