Close Handler fixed