1 files changed, 3 insertions, 3 deletions

diff --git a/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala b/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala
index 093257c0..14b28d54 100644
--- a/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala
+++ b/kamon-core/src/main/scala/kamon/trace/SpanCodec.scala
@@ -137,8 +137,8 @@ object SpanCodec {
 
         val spanContext = SpanContext(
           traceID = identityProvider.traceIdGenerator().from(colferSpan.traceID),
-          spanID = identityProvider.traceIdGenerator().from(colferSpan.spanID),
-          parentID = identityProvider.traceIdGenerator().from(colferSpan.parentID),
+          spanID = identityProvider.spanIdGenerator().from(colferSpan.spanID),
+          parentID = identityProvider.spanIdGenerator().from(colferSpan.parentID),
           samplingDecision = byteToSamplingDecision(colferSpan.samplingDecision)
         )
 
@@ -165,4 +165,4 @@ object SpanCodec {
       override def initialValue(): Array[Byte] = Array.ofDim[Byte](256)
     }
   }
-}
\ No newline at end of file
+}