Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
===================================================================
diff -u -r56c27b3189648840c72a62d403908a6e4378c7af -r7efcd9b3d150423e662fd80e8304a9290d6e9be3
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 56c27b3189648840c72a62d403908a6e4378c7af)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java	(.../PeerreviewServiceImpl.java)	(revision 7efcd9b3d150423e662fd80e8304a9290d6e9be3)
@@ -758,14 +758,20 @@
 	    toolContentObj.setContentId(toolContentId);
 	    Map<Integer, Integer> groupIdMap = new HashMap<>();
 	    if (toolContentObj.getRatingCriterias() != null) {
+		Integer nextRatingCriteriaGroupId = null;
 		for (LearnerItemRatingCriteria criteria : toolContentObj.getRatingCriterias()) {
 		    criteria.setToolContentId(toolContentId);
 
 		    if (criteria.getRatingStyle().equals(RatingCriteria.RATING_STYLE_RUBRICS)) {
 			int existingGroupId = criteria.getRatingCriteriaGroupId();
 			Integer newGroupId = groupIdMap.get(existingGroupId);
 			if (newGroupId == null) {
-			    newGroupId = ratingService.getNextRatingCriteriaGroupId();
+			    if (nextRatingCriteriaGroupId == null) {
+				nextRatingCriteriaGroupId = ratingService.getNextRatingCriteriaGroupId();
+			    } else {
+				nextRatingCriteriaGroupId++;
+			    }
+			    newGroupId = nextRatingCriteriaGroupId;
 			    groupIdMap.put(existingGroupId, newGroupId);
 
 			    for (int columnIndex = 0; columnIndex < criteria.getRubricsColumnHeaders()