Fixed multiple close issue #6615
Merge pull request #6780 from cbordei/hotfix/issue-6615

Fixed multiple close issue #6615