diff --git a/asam_cmp_capture_module/src/encoder_bank.cpp b/asam_cmp_capture_module/src/encoder_bank.cpp
index 1d80406..3f589cd 100644
--- a/asam_cmp_capture_module/src/encoder_bank.cpp
+++ b/asam_cmp_capture_module/src/encoder_bank.cpp
@@ -6,7 +6,7 @@ void EncoderBank::init(uint16_t deviceId)
 {
     for (size_t i = 0; i < encodersCount; ++i){
         encoders[i].setDeviceId(deviceId);
-        encoders[i].setStreamId(i);
+        encoders[i].setStreamId(static_cast<uint8_t>(i));
     }
 }
 
diff --git a/external/AsamCmpLib/CMakeLists.txt b/external/AsamCmpLib/CMakeLists.txt
index db43b23..a209116 100644
--- a/external/AsamCmpLib/CMakeLists.txt
+++ b/external/AsamCmpLib/CMakeLists.txt
@@ -6,6 +6,6 @@ set(ASAM_CMP_LIB_ENABLE_TESTS OFF)
 FetchContent_Declare(
     AsamCmpLib
     GIT_REPOSITORY https://github.com/openDAQ/ASAM-CMP-Library.git
-    GIT_TAG        261cd2c03b4207f33dd2c2be545bc2d27e0f40cb
+    GIT_TAG        v1.0.2-rc
 )
 FetchContent_MakeAvailable(AsamCmpLib)