Fix form state