Fixing the structure modification