REstruct fix