fixed a dependency cycle