Fixed reestructuration errors