fix close issue again
more stuff