Tweak to on close