fixed auto-delete feature