Final structure fix