fix the circural structure