fix circular structure