keep ours fix for rename/delete