Fixed the issue with group operations