Investigate saving form issue