Fix Edit/Delete bug