fix dep cycle