Actually closing the right ones...