Fix problem with top-level items.