more changes on connection not close issue