Solution structure fix