fix cyclic