import cycle fix