-- fix structure