Bug fix
structure fix