Fix issue with missing group