Fixed close issue