Fixed form save bug