circular import fix