Bug fix in edit with modal form