fix for circular deps