Fix form parsing