BS-1990
Fix issue with root groups