diff --git a/src/tmx/TmxCore/src/MessageRouterBasic.cpp b/src/tmx/TmxCore/src/MessageRouterBasic.cpp
index 4ac9a61d1..75e0e368f 100644
--- a/src/tmx/TmxCore/src/MessageRouterBasic.cpp
+++ b/src/tmx/TmxCore/src/MessageRouterBasic.cpp
@@ -52,8 +52,7 @@ void MessageRouterBasic::broadcastMessage(MessageReceiver *sender, IvpMessage *m
 
 	pthread_mutex_lock(&this->mActiveBroadcastsLock);
 	// Volatile type should not be used in compound operations cpp:S6191
-	auto val = this->mActiveBroadcasts;
-	this->mActiveBroadcasts = val + 1;
+	this->mActiveBroadcasts++;
 	pthread_mutex_unlock(&this->mActiveBroadcastsLock);
 
 	int broadcastCount = 0;
@@ -107,10 +106,10 @@ void MessageRouterBasic::broadcastMessage(MessageReceiver *sender, IvpMessage *m
 			}
 		}
 	}
+	
 	// Volatile type should not be used in compound operations cpp:S6191
 	pthread_mutex_lock(&this->mActiveBroadcastsLock);
-	auto val = this->mActiveBroadcasts;
-	this->mActiveBroadcasts = val - 1;
+	this->mActiveBroadcasts--;
 	pthread_mutex_unlock(&this->mActiveBroadcastsLock);
 
 	//LOG_DEBUG("MessageRouterBasic::broadcastMessage for " << msg->subtype << " from "<< sender->pluginName << " Time (ms) "<<timer_ms);
diff --git a/src/tmx/TmxCore/src/MessageRouterBasic.h b/src/tmx/TmxCore/src/MessageRouterBasic.h
index 58cc10dc5..60d8fd04c 100644
--- a/src/tmx/TmxCore/src/MessageRouterBasic.h
+++ b/src/tmx/TmxCore/src/MessageRouterBasic.h
@@ -52,7 +52,7 @@ class MessageRouterBasic : public MessageRouter
 	 * Keeps track of how many threads are actively inside the broadcast method in a thread safe manner (using mActiveBroadcastsLock).
 	 * This is to allow concurrent execution of the broadcast, but give the register and unregister methods a way to tell when broadcasts are inactive.
 	 */
-	volatile int mActiveBroadcasts;
+	int mActiveBroadcasts;
 
 	/*!
 	 * Used to keep the mActiveBroadcast count accurate since multiple thread's may be accessing.