Fixes #2243 Group Bug