fixing dependency cycle