Fixing empty group list see BT#8048