Bug fix in edit form