Fix empty group problem