dependency cycle fix
dependency_cycle_fix