Circular import fix