diff --git a/R/kknn.R b/R/kknn.R
index 04541ed..ecb4038 100644
--- a/R/kknn.R
+++ b/R/kknn.R
@@ -697,11 +697,12 @@ plot.train.kknn <-function(x,...){
 
 cv.kknn <- function(formula, data, kcv = 10, ...)
 {
+  data <- data[sample(nrow(data)),]
   mf <- model.frame(formula, data=data) 
   # terms(formula, data = data) keine kopie der Daten?
   y <- model.response(mf)                 
   l <- length(y)    # nrow(data)                  
-  val<-sample(kcv, size=l, replace=TRUE) 
+  val <- cut(seq(1, nrow(data)), breaks = kcv, labels = FALSE)
   yhat <- numeric(l)
   for(i in 1:kcv){
     m <- dim(data)[1]