Fixed bug from changing strcutre