Another fix to trimming the toplevel group