Tweak close()