fix structure
fix structure