Another quick fix for single element groups