Improved CloseEvent