Fixed circular import bug