Fixed onClose option