fixup circular dependency