Fix form saving bug