Ensure containers are closed in the correct spot