Fixed early open / close error