Fix cyclic import