Cyclic import fixed