Fixing the structure.