Fixed circular import