diff --git a/src/main/java/com/profiler/StopWatch.java b/src/main/java/com/profiler/StopWatch.java
index 7cdc6faae..f13431a20 100644
--- a/src/main/java/com/profiler/StopWatch.java
+++ b/src/main/java/com/profiler/StopWatch.java
@@ -13,10 +13,10 @@ public class StopWatch {
 		Map<String, Long> map = local.get();
 		if (map == null) {
 			map = new HashMap<String, Long>(1);
-			map.put(name, System.currentTimeMillis());
+			map.put(name, System.nanoTime());
 			local.set(map);
 		} else {
-			map.put(name, System.currentTimeMillis());
+			map.put(name, System.nanoTime());
 		}
 	}
 
@@ -25,7 +25,7 @@ public class StopWatch {
 		if (map == null) {
 			throw new IllegalStateException("Stopwatch is not started.");
 		} else {
-			return System.currentTimeMillis() - map.get(name);
+			return System.nanoTime() - map.get(name);
 		}
 	}
 }
diff --git a/src/main/java/com/profiler/context/Span.java b/src/main/java/com/profiler/context/Span.java
index a7c1cce8a..316553d72 100644
--- a/src/main/java/com/profiler/context/Span.java
+++ b/src/main/java/com/profiler/context/Span.java
@@ -27,7 +27,7 @@ public class Span {
 		this.traceID = traceId;
 		this.name = name;
 		this.endPoint = endPoint;
-		this.createTime = System.nanoTime();
+		this.createTime = System.currentTimeMillis();
 	}
 
 	public boolean addAnnotation(HippoAnnotation annotation) {