Bug fix in save form