[NTD] fixed bug on closing