Fix circular import