fix form saving