fix advanced data structure