Fix reopen issue