Fixed a final issue with closing.