Fix cyclic reference