Fixing group bug