Fix form bug 2