Deal with missing groups, close #2465