fixed dependency cycle error