Hopefully made it close cleanly