- added additional handling when closed