Fix new form bug