Fixed form2 bug