Fixed auto-deletion (close #21)