diff --git a/src/cpp/py_rans/rans.cpp b/src/cpp/py_rans/rans.cpp
index 2c42bac..11eb342 100644
--- a/src/cpp/py_rans/rans.cpp
+++ b/src/cpp/py_rans/rans.cpp
@@ -257,8 +257,8 @@ RansEncoderLibMultiThread::RansEncoderLibMultiThread()
     : RansEncoderLib()
     , m_finish(false)
     , m_result_ready(false)
-    , m_thread(std::thread(&RansEncoderLibMultiThread::worker, this))
 {
+    m_thread = std::thread(&RansEncoderLibMultiThread::worker, this);
 }
 RansEncoderLibMultiThread::~RansEncoderLibMultiThread()
 {
@@ -437,8 +437,8 @@ RansDecoderLibMultiThread::RansDecoderLibMultiThread()
     : RansDecoderLib()
     , m_finish(false)
     , m_result_ready(false)
-    , m_thread(std::thread(&RansDecoderLibMultiThread::worker, this))
 {
+    m_thread = std::thread(&RansDecoderLibMultiThread::worker, this);
 }
 
 RansDecoderLibMultiThread::~RansDecoderLibMultiThread()
diff --git a/src/layers/cuda_inference.py b/src/layers/cuda_inference.py
index dee9836..500c091 100644
--- a/src/layers/cuda_inference.py
+++ b/src/layers/cuda_inference.py
@@ -135,11 +135,11 @@ def build_index_dec(scales, scale_min, scale_max, log_scale_min, log_step_recip,
         return out, skip_cond
 
     skip_cond = None
-    if skip_thres is not None:
-        skip_cond = scales > skip_thres
     scales = scales.clamp_(scale_min, scale_max)
     indexes = (torch.log(scales) - log_scale_min) * log_step_recip
     indexes = indexes.to(dtype=torch.uint8)
+    if skip_thres is not None:
+        skip_cond = scales > skip_thres
     return indexes, skip_cond