Fixed multiple close issue #6615

Update on issue #6615