Fixed empty group problem