bugfix with edit/delete