fix delete and rename