Fix for G40's unnamed group problem