fixing a dependency cycle