diff --git a/R/ggheatmap.R b/R/ggheatmap.R
index 2ed6c91..b480c20 100644
--- a/R/ggheatmap.R
+++ b/R/ggheatmap.R
@@ -17,9 +17,6 @@ ggheatmap<-function(df, x=NULL, y=NULL, value=NULL, grouping="mean", exclude_gro
     df<-df %>% summarise(Value=median(Value)) %>% ungroup
   }
   order<-clustsort(df %>% spread(VarY,Value) %>% select(!all_of(exclude_group)) %>% as.data.frame)
-
-  df$VarX<-factor(df$VarX, levels=order$x)
-  df$VarY<-factor(df$VarY, levels=order$y)
   
   if (scale != "none"){
     if (scale == "rows"){
@@ -36,6 +33,9 @@ ggheatmap<-function(df, x=NULL, y=NULL, value=NULL, grouping="mean", exclude_gro
     }
   }
   
+  df$VarX<-factor(df$VarX, levels=order$x)
+  df$VarY<-factor(df$VarY, levels=order$y)
+  
   df %>%
     ggplot(aes(VarX, VarY, fill=Value))+
     labs(x=x, y=y)+