Fix auto delete