Fix the new form so it build a valid hierarchy