Groups now are being checked properly