Fixed DeleteOnTerminate