Another structure fix