bug fix create_edit