fixup dependency cycle