diff --git a/src/blackmisc/tokenbucket.cpp b/src/blackmisc/tokenbucket.cpp
index 822bbf2fe..6f72d62b0 100644
--- a/src/blackmisc/tokenbucket.cpp
+++ b/src/blackmisc/tokenbucket.cpp
@@ -17,7 +17,7 @@ using namespace BlackMisc::PhysicalQuantities;
 namespace BlackMisc
 {
     CTokenBucket::CTokenBucket(int capacity, const CTime &interval, int numTokensToRefill)
-        : m_capacity(capacity), m_interval(interval), m_numTokensToRefill(numTokensToRefill) {}
+        : m_capacity(capacity), m_intervalSecs(interval.value(CTimeUnit::s())), m_numTokensToRefill(numTokensToRefill) {}
 
     bool CTokenBucket::tryConsume(int numTokens)
     {
@@ -52,7 +52,7 @@ namespace BlackMisc
     {
         const auto now = QDateTime::currentDateTime();
         const auto deltaSeconds = m_lastReplenishmentTime.secsTo(now);
-        const int numberOfTokens = static_cast<int>(m_numTokensToRefill * deltaSeconds / m_interval.value(CTimeUnit::s()));
+        const int numberOfTokens = static_cast<int>(m_numTokensToRefill * deltaSeconds / m_intervalSecs);
 
         // Update the time only when replenishment actually took place. We will end up in a infinite loop otherwise.
         if (numberOfTokens > 0) { m_lastReplenishmentTime = now; }
diff --git a/src/blackmisc/tokenbucket.h b/src/blackmisc/tokenbucket.h
index 267e88ae4..bfc777406 100644
--- a/src/blackmisc/tokenbucket.h
+++ b/src/blackmisc/tokenbucket.h
@@ -47,7 +47,7 @@ namespace BlackMisc
 
         int m_capacity = 10;        //!< Maximum capacity of tokens
         int m_availableTokens = 10; //!< Currently available tokens. The initial value is 10
-        PhysicalQuantities::CTime m_interval; //!< Refill interval, e.g. every 5 secs
+        double m_intervalSecs = 5;  //!< Refill interval, e.g. every 5 secs
         int m_numTokensToRefill;    //!< Number of tokens to be refilled each interval
         QDateTime m_lastReplenishmentTime = QDateTime::currentDateTime(); //!< Last time
     };