diff --git a/apier/v1/cdrstatsv1_local_test.go b/apier/v1/cdrstatsv1_local_test.go
index 814b36d00..e1cd0493b 100644
--- a/apier/v1/cdrstatsv1_local_test.go
+++ b/apier/v1/cdrstatsv1_local_test.go
@@ -153,7 +153,7 @@ func TestCDRStatsLclPostCdrs(t *testing.T) {
 			t.Error(err.Error())
 		}
 	}
-	time.Sleep(time.Duration(1000) * time.Millisecond)
+	time.Sleep(time.Duration(*waitRater) * time.Millisecond)
 }
 
 func TestCDRStatsLclGetMetrics1(t *testing.T) {
diff --git a/engine/cdrs.go b/engine/cdrs.go
index 56b643bac..293069549 100644
--- a/engine/cdrs.go
+++ b/engine/cdrs.go
@@ -272,11 +272,12 @@ func (self *CdrServer) deriveRateStoreStatsReplicate(cdr *CDR, store, stats, rep
 }
 
 func (self *CdrServer) deriveCdrs(cdr *CDR) ([]*CDR, error) {
-	cdrRuns := []*CDR{cdr}
+	dfltCDRRun := cdr.Clone()
+	cdrRuns := []*CDR{dfltCDRRun}
 	if cdr.RunID != utils.MetaRaw { // Only derive *raw CDRs
 		return cdrRuns, nil
 	}
-	cdr.RunID = utils.META_DEFAULT // Rewrite *raw with *default since we have it as first run
+	dfltCDRRun.RunID = utils.META_DEFAULT // Rewrite *raw with *default since we have it as first run
 	if err := LoadUserProfile(cdr, utils.EXTRA_FIELDS); err != nil {
 		return nil, err
 	}