Fix issue with skipping circular structures