BUGFIX: Handle closing directories - 2