Structure bug fixed