Trying to fix structure