diff --git a/R/ModelFrameProcessing.R b/R/ModelFrameProcessing.R
index a54343f..a0d6c83 100644
--- a/R/ModelFrameProcessing.R
+++ b/R/ModelFrameProcessing.R
@@ -510,7 +510,10 @@ candsetmaxpro <- function(candmat, npoints = NULL, groupid = NULL){
 
   if(is.null(groupid)){
 
-    designvec <- sample(c(1:nrow(D0)), npoints)
+    initial_replacement = FALSE
+    if(nrow(D0) < npoints){initial_replacement = TRUE}
+
+    designvec <- sample(c(1:nrow(D0)), npoints, replace = initial_replacement)
 
   }else{
     designvec <- sapply(c(1:npoints), function(x) sample(which(groupid == x), size = 1))