Group tab fix from David Halter (#4268).