Fixing the structure