Fixed crash, structure changes