Fix cyclic issue