diff --git a/assignment-client/src/audio/AudioMixer.cpp b/assignment-client/src/audio/AudioMixer.cpp
index 729c2fe5db..4ba5802026 100644
--- a/assignment-client/src/audio/AudioMixer.cpp
+++ b/assignment-client/src/audio/AudioMixer.cpp
@@ -77,10 +77,9 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
     pluginManager->setPluginFilter(codecPluginFilter);
 
     const auto& codecPlugins = pluginManager->getCodecPlugins();
-    for_each(codecPlugins.cbegin(), codecPlugins.cend(),
-        [&](const CodecPluginPointer& codec) {
-            _availableCodecs[codec->getName()] = codec;
-        });
+    for(const auto& codec : codecPlugins) {
+        _availableCodecs[codec->getName()] = codec;
+    }
 
     auto nodeList = DependencyManager::get<NodeList>();
     auto& packetReceiver = nodeList->getPacketReceiver();