Fix form bug