Rework of open method allow for simple reopen after close