Fix the structure