fixed issues caused by an auto-deletion