Data structure fix