fix form2 bugs