fixing restructuring errors