fixes dependency cycle